From 08aea2f44ef1ecde0043191ce4a1ea477948cfb9 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Wed, 13 Jun 2007 15:19:00 +0000 Subject: [PATCH] - re-enabled building of the ocaml-source package - as a side effect noticed that some changes were done on debian/control insted of debian/control.in, fixed those --- debian/changelog | 15 +++++++++++---- debian/control | 12 ++++++++++++ debian/control.in | 2 +- debian/ocaml-source.dirs.in | 1 + debian/ocaml-source.exclude | 2 ++ debian/ocaml-source.install.in | 1 + debian/rules | 22 +++++++++++----------- 7 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 debian/ocaml-source.dirs.in create mode 100644 debian/ocaml-source.exclude create mode 100644 debian/ocaml-source.install.in diff --git a/debian/changelog b/debian/changelog index d23f2813..a56ebc5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,13 +2,20 @@ ocaml (3.10.0-1) UNRELEASED; urgency=low [ Stefano Zacchiroli ] * New upstream (stable) release - * ship ocaml-compiler-libs objects as STDLIB/ocaml-compiler-libs/{parsing/, - typing/, utils/} rather than as a flat dir tree * debian/patches/* - removed: ocaml-interp_manpage, build_wo_debug_info (integrated upstream) - updated: install_ocamlbuild - - -- Stefano Zacchiroli Wed, 13 Jun 2007 16:15:14 +0200 + * ship ocaml-compiler-libs objects as STDLIB/ocaml-compiler-libs/{parsing/, + typing/, utils/} rather than as a flat dir tree + * re-enabled ocaml-source package (which ships + /usr/src/ocaml-3.10.0.tar.bz2), now with a better way to generate it: + everything in the build dir except debian/ will be copied in the resulting + tarball + * debian/ocaml-source.exclude + - new file: list of tar exclude patterns, matching file won't be shipped + in the ocaml source tarball + + -- Stefano Zacchiroli Wed, 13 Jun 2007 17:15:06 +0200 ocaml (3.10.0~beta-1) experimental; urgency=low diff --git a/debian/control b/debian/control index ab62650c..1a5c2d39 100644 --- a/debian/control +++ b/debian/control @@ -112,6 +112,18 @@ Description: Native code compilers of the ocaml suite (the .opt ones) For big source codes, these packages can be two to three times faster, but for most normal sized sources, the difference won't be noticeable. +Package: ocaml-source +Architecture: all +Provides: ocaml-source-${F:OCamlABI} +Description: Sources for Objective Caml + Objective Caml is an implementation of the ML language, based on + the Caml Light dialect extended with a complete class-based object system + and a powerful module system in the style of Standard ML. + . + This package contains the sources needed to build some packages which build + depend on the ocaml source. Notice that if you want to rebuild ocaml, these + will not work, consider using the source package instead. + Package: ocaml-interp Architecture: any Provides: ocaml-interp-${F:OCamlABI} diff --git a/debian/control.in b/debian/control.in index 6d8fcf40..69cd41cf 100644 --- a/debian/control.in +++ b/debian/control.in @@ -94,7 +94,7 @@ Description: Runtime system for ocaml bytecode executables This package contains only the runtime system needed to run bytecode executables. The `ocaml' package contains the full development suite of Objective Caml. You may wish to install the 'ocaml-base-nox' package if - you do not require any graphical capilities for your runtime. + you do not require any graphical capabilities for your runtime. Package: ocaml-native-compilers Architecture: #OcamlNativeArchs# diff --git a/debian/ocaml-source.dirs.in b/debian/ocaml-source.dirs.in new file mode 100644 index 00000000..b601f22c --- /dev/null +++ b/debian/ocaml-source.dirs.in @@ -0,0 +1 @@ +usr/src diff --git a/debian/ocaml-source.exclude b/debian/ocaml-source.exclude new file mode 100644 index 00000000..ca64c3eb --- /dev/null +++ b/debian/ocaml-source.exclude @@ -0,0 +1,2 @@ +*/debian +*/*-stamp diff --git a/debian/ocaml-source.install.in b/debian/ocaml-source.install.in new file mode 100644 index 00000000..d50e30c0 --- /dev/null +++ b/debian/ocaml-source.install.in @@ -0,0 +1 @@ +debian/ocaml-#OcamlABI#.tar.bz2 /usr/src/ diff --git a/debian/rules b/debian/rules index 2ae7a436..aa75b87e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,12 +1,6 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 - -# We want to use dpatch. include /usr/share/dpatch/dpatch.make + PACKAGE = ocaml OCAMLMAJOR = 3.10 OCAMLMINOR = 0 @@ -16,6 +10,7 @@ MD5SUMSDIR = /var/lib/ocaml/md5sums INSTDIR = $(CURDIR)/debian/ocaml-nox/usr NATIVE_ARCHS = $(shell cat debian/native-archs) +DISTDIR = $(PACKAGE)-$(OCAMLMAJOR).$(OCAMLMINOR) # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -106,10 +101,14 @@ endif $(MAKE) -C debian/policy touch build-arch-stamp -build-indep: build-indep-stamp -build-indep-stamp: patch-stamp config-stamp - # Add here commands to compile the indep part of the package. - #$(MAKE) doc +build-indep: build-indep-stamp config-stamp +build-indep-stamp: patch-stamp + # create ocaml source tarball + ln -fs . $(DISTDIR) # beware of the symlink recursion! + tar --anchored -chjf debian/$(DISTDIR).tar.bz2 \ + --exclude=$(DISTDIR)/$(DISTDIR) \ + --exclude-from=debian/ocaml-source.exclude \ + $(DISTDIR)/ touch $@ clean: abi-sed unpatch @@ -136,6 +135,7 @@ endif dh_clean debian/README.labltk camlp4/config/Makefile.cnf camlp4/config/Makefile config/m.h config/s.h config/Makefile emacs/ocamltags driver/ocamlcomp.sh debian/rules abi-sed-clean + rm -f debian/$(DISTDIR).tar.bz2 install: install-indep install-arch install-indep: build-indep -- 2.30.2